Another attempt at fixing focus issues with undecorated windows. Revert

2008-01-31  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzView.c: Another attempt at fixing focus
	issues with undecorated windows. Revert the change done on
	2008-01-25 and fix it by using the view's bounds instead. The
	bounds will always be up to date when setting up the tracking
	rect, so this should be more robust.

svn path=/trunk/; revision=19445

diff --git a/ChangeLog b/ChangeLog
index 2504bd2386829d5f71401386b673d01c1c53a694..f543b1a23d571c52b88f700538203ee7945b4554 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-31  Richard Hult  <richard@imendio.com>
+
+       * gdk/quartz/GdkQuartzView.c: Another attempt at fixing focus
+       issues with undecorated windows. Revert the change done on
+       2008-01-25 and fix it by using the view's bounds instead. The
+       bounds will always be up to date when setting up the tracking
+       rect, so this should be more robust.
+
 2008-01-30  Sven Neumann  <sven@gimp.org>
 
        * gdk/directfb/gdkdrawable-directfb.c

diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
index cabbcbe5ad22795b9fca3fd1a45317f68dccb79d..7395a8cceb1cad322ebe750ddbdfb8722cdc8093 100644 (file)
--- a/gdk/quartz/GdkQuartzView.c
+++ b/gdk/quartz/GdkQuartzView.c
@@ -141,7 +141,7 @@
    * NSPointInRect ([[self window] convertScreenToBase:[NSEvent mouseLocation]], rect)
    */
 
-  rect = NSMakeRect (0, 0, impl->width, impl->height);
+  rect = [self bounds];
   trackingRect = [self addTrackingRect:rect
                                  owner:self
                               userData:nil
@@ -167,22 +167,8 @@
 
 -(void)setBounds:(NSRect)bounds
 {
-  NSRect old_bounds;
-  gboolean changed = FALSE;
-
-  old_bounds = [self bounds];
-  if (old_bounds.origin.x != bounds.origin.x ||
-      old_bounds.origin.y != bounds.origin.y ||
-      old_bounds.size.width != bounds.size.width ||
-      old_bounds.size.height != bounds.size.height)
-    {
-      changed = TRUE;
-    }
-  
   [super setBounds:bounds];
-
-  if (changed)
-    [self updateTrackingRect];
+  [self updateTrackingRect];
 }
 
 @end

diff --git a/gdk/quartz/GdkQuartzView.h b/gdk/quartz/GdkQuartzView.h
index 1da55e3773be141d304190b00c749efeff979439..29172e4382102a802b90996b4fc8ad9bca601b89 100644 (file)
--- a/gdk/quartz/GdkQuartzView.h
+++ b/gdk/quartz/GdkQuartzView.h
@@ -30,7 +30,3 @@
 -(GdkWindow *)gdkWindow;
 
 @end
-
-
-
-